ppsspp: add upstream patch for FFmpeg 6#336187
Merged
emilazy merged 1 commit intoNixOS:masterfrom Aug 23, 2024
Merged
Conversation
The bundled FFmpeg is used by default anyway, but this fixes compilation with FFmpeg 6 when opting in.
ofborg
bot
added
10.rebuild-darwin: 0
Member
|
Why do we even have an option to use the bundled ffmpeg? This seems to go against the distro idea |
Member
Author
|
Because upstream have their own hacked up FFmpeg and the emulator is often broken with the system one and they don’t support it and are trying to rip out the FFmpeg code entirely in favour of their own stuff. That seems like a distinct discussion from whether to get it off FFmpeg 4. If you want to get rid of vendored FFmpegs, I’d suggest starting with Chromium (I did some work there for Qt WebEngine that would be useful). |
SuperSandro2000
approved these changes
Aug 23, 2024
AndersonTorres
approved these changes
Aug 23, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
The bundled FFmpeg is used by default anyway, but this fixes compilation with FFmpeg 6 when opting in.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.